From 3224e72bc132946edcaf0563c48cb76673e15446 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Mon, 24 Jun 2013 17:57:44 -0400 Subject: [PATCH] Don't use stock APIs in the testsuite --- testsuite/a11y/children.c | 12 ++-- testsuite/a11y/menu.ui | 42 +++++-------- testsuite/a11y/menus.ui | 10 ++-- testsuite/a11y/notebook.ui | 6 +- testsuite/gtk/filechooser.c | 24 ++++---- testsuite/gtk/templates.c | 2 +- testsuite/reftests/inherit-and-initial.ref.ui | 59 ++++++++----------- testsuite/reftests/inherit-and-initial.ui | 59 ++++++++----------- testsuite/reftests/separator-size.ref.ui | 8 +-- testsuite/reftests/separator-size.ui | 8 +-- 10 files changed, 97 insertions(+), 133 deletions(-) diff --git a/testsuite/a11y/children.c b/testsuite/a11y/children.c index f94e4959a7..21d280172d 100644 --- a/testsuite/a11y/children.c +++ b/testsuite/a11y/children.c @@ -116,14 +116,14 @@ do_create_child (STATE *state, gint i) switch (i) { case 0: - gtk_entry_set_icon_from_stock (GTK_ENTRY (state->widget), - GTK_ENTRY_ICON_PRIMARY, - GTK_STOCK_CAPS_LOCK_WARNING); + gtk_entry_set_icon_from_icon_name (GTK_ENTRY (state->widget), + GTK_ENTRY_ICON_PRIMARY, + "dialog-warning-symbolic"); return TRUE; case 1: - gtk_entry_set_icon_from_stock (GTK_ENTRY (state->widget), - GTK_ENTRY_ICON_SECONDARY, - GTK_STOCK_CLEAR); + gtk_entry_set_icon_from_icon_name (GTK_ENTRY (state->widget), + GTK_ENTRY_ICON_SECONDARY, + "edit-clear"); return TRUE; default: return FALSE; diff --git a/testsuite/a11y/menu.ui b/testsuite/a11y/menu.ui index bb2274f515..d4509c2085 100644 --- a/testsuite/a11y/menu.ui +++ b/testsuite/a11y/menu.ui @@ -19,23 +19,21 @@ True False - - gtk-new + + _New True False False True - True - - gtk-open + + _Open True False False True - True True @@ -78,23 +76,21 @@ - - gtk-save + + _Save True False False True - True - gtk-save-as + Save _As True False False True - True @@ -122,13 +118,12 @@ - - gtk-quit + + _Quit True False False True - True @@ -147,43 +142,39 @@ True False - - gtk-cut + + Cu_t True False False True - True - gtk-copy + _Copy True False False True - True - gtk-paste + _Paste True False False True - True - gtk-delete + _Delete True False False True - True @@ -211,13 +202,12 @@ True False - - gtk-about + + _About True False False True - True diff --git a/testsuite/a11y/menus.ui b/testsuite/a11y/menus.ui index 5b926f3917..d641a67c12 100644 --- a/testsuite/a11y/menus.ui +++ b/testsuite/a11y/menus.ui @@ -4,7 +4,7 @@ True False - gtk-go-up + go-up 5 @@ -25,23 +25,21 @@ True False - - gtk-new + + _New True False False True - True - + bla True False False image1 - False diff --git a/testsuite/a11y/notebook.ui b/testsuite/a11y/notebook.ui index 95d1328ab0..46cc7378a2 100644 --- a/testsuite/a11y/notebook.ui +++ b/testsuite/a11y/notebook.ui @@ -9,8 +9,7 @@ True - gtk-yes - True + Yes True @@ -22,8 +21,7 @@ - gtk-no - True + No True diff --git a/testsuite/gtk/filechooser.c b/testsuite/gtk/filechooser.c index 529f87d46b..831425ffbc 100644 --- a/testsuite/gtk/filechooser.c +++ b/testsuite/gtk/filechooser.c @@ -130,11 +130,11 @@ test_set_filename (GtkFileChooserAction action, guint timeout_id; chooser = gtk_file_chooser_dialog_new ("hello", NULL, action, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL, NULL); closure.chooser = chooser; - closure.accept_button = gtk_dialog_add_button (GTK_DIALOG (chooser), GTK_STOCK_OK, GTK_RESPONSE_ACCEPT); + closure.accept_button = gtk_dialog_add_button (GTK_DIALOG (chooser), _("_OK"), GTK_RESPONSE_ACCEPT); closure.focus_button = focus_button; gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT); @@ -1796,10 +1796,10 @@ test_confirm_overwrite_for_path (const char *path, gboolean append_extension) closure.extension = NULL; closure.confirm_overwrite_signal_emitted = 0; closure.chooser = gtk_file_chooser_dialog_new ("hello", NULL, GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL, NULL); closure.accept_button = gtk_dialog_add_button (GTK_DIALOG (closure.chooser), - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT); + _("_Save"), GTK_RESPONSE_ACCEPT); gtk_dialog_set_default_response (GTK_DIALOG (closure.chooser), GTK_RESPONSE_ACCEPT); gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (closure.chooser), TRUE); @@ -2059,9 +2059,9 @@ test_action_widgets (void) dialog = gtk_file_chooser_dialog_new ("Test file chooser", NULL, GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, + _("_OK"), GTK_RESPONSE_ACCEPT, NULL); gtk_widget_show_now (dialog); @@ -2097,9 +2097,9 @@ test_reload_sequence (gboolean set_folder_before_map) dialog = gtk_file_chooser_dialog_new ("Test file chooser", NULL, GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, + _("_Cancel"), GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, + _("_OK"), GTK_RESPONSE_ACCEPT, NULL); impl = get_impl_from_dialog (dialog); @@ -2258,8 +2258,8 @@ test_button_folder_states_for_action (GtkFileChooserAction action, gboolean use_ if (use_dialog) { dialog = gtk_file_chooser_dialog_new ("Test", NULL, action, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + _("_Cancel"), GTK_RESPONSE_CANCEL, + _("_OK"), GTK_RESPONSE_ACCEPT, NULL); button = gtk_file_chooser_button_new_with_dialog (dialog); @@ -2398,8 +2398,8 @@ test_folder_switch_and_filters (void) base_dir = g_build_filename (cwd, "file-chooser-test-dir", NULL); dialog = gtk_file_chooser_dialog_new ("Test", NULL, GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, + _("_Cancel"), GTK_RESPONSE_CANCEL, + _("_OK"), GTK_RESPONSE_ACCEPT, NULL); impl = get_impl_from_dialog (dialog); diff --git a/testsuite/gtk/templates.c b/testsuite/gtk/templates.c index 32c1e68080..66ccd1f0de 100644 --- a/testsuite/gtk/templates.c +++ b/testsuite/gtk/templates.c @@ -230,7 +230,7 @@ test_file_chooser_dialog_basic (void) widget = gtk_file_chooser_dialog_new ("The Dialog", NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, - GTK_STOCK_OK, GTK_RESPONSE_OK, + "_OK", GTK_RESPONSE_OK, NULL); g_assert (GTK_IS_FILE_CHOOSER_DIALOG (widget)); diff --git a/testsuite/reftests/inherit-and-initial.ref.ui b/testsuite/reftests/inherit-and-initial.ref.ui index 5d5d7c3c14..95f0635af1 100644 --- a/testsuite/reftests/inherit-and-initial.ref.ui +++ b/testsuite/reftests/inherit-and-initial.ref.ui @@ -80,47 +80,43 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False - - gtk-new + + _New inherit True False False True - True - - gtk-open + + _Open inherit True False False True - True - - gtk-save + + _Save inherit True False False True - True - - gtk-save-as + + Save _As inherit True False False True - True @@ -132,14 +128,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - - gtk-quit + + _Quit inherit True False False True - True @@ -160,62 +155,57 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False - - gtk-cut + + Cu_t accelgroup1 inherit True True False True - True - - gtk-copy + + _Copy accelgroup1 inherit True False False True - True - - gtk-paste + + _Paste accelgroup1 inherit True False False True - True - - gtk-delete + + _Delete accelgroup1 inherit True False False True - True - + Checks & Radios inherit True False False True - False inherit @@ -424,14 +414,13 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False - - gtk-about + + _About inherit True False False True - True @@ -461,7 +450,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False Save True - gtk-save + document-save False @@ -476,7 +465,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False Open True - gtk-open + document-open False @@ -503,7 +492,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False Find True - gtk-find + edit-find False diff --git a/testsuite/reftests/inherit-and-initial.ui b/testsuite/reftests/inherit-and-initial.ui index c8a31e8faf..a0f053bcb4 100644 --- a/testsuite/reftests/inherit-and-initial.ui +++ b/testsuite/reftests/inherit-and-initial.ui @@ -76,43 +76,39 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False - - gtk-new + + _New True False False True - True - - gtk-open + + _Open True False False True - True - - gtk-save + + _Save True False False True - True - - gtk-save-as + + Save _As True False False True - True @@ -123,13 +119,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - - gtk-quit + + _Quit True False False True - True @@ -148,57 +143,52 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False - - gtk-cut + + Cu_t accelgroup1 True True False True - True - - gtk-copy + + _Copy accelgroup1 True False False True - True - - gtk-paste + + _Paste accelgroup1 True False False True - True - - gtk-delete + + _Delete accelgroup1 True False False True - True - + Checks & Radios True False False True - False True @@ -388,13 +378,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False - - gtk-about + + _About True False False True - True @@ -422,7 +411,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False Save True - gtk-save + document-save False @@ -436,7 +425,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False Open True - gtk-open + document-open False @@ -461,7 +450,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False Find True - gtk-find + edit-find False diff --git a/testsuite/reftests/separator-size.ref.ui b/testsuite/reftests/separator-size.ref.ui index 51cc9dbfe2..1e450d5798 100644 --- a/testsuite/reftests/separator-size.ref.ui +++ b/testsuite/reftests/separator-size.ref.ui @@ -12,7 +12,7 @@ True False - gtk-about + help-about 0 @@ -25,7 +25,7 @@ True False - gtk-about + help-about 2 @@ -38,7 +38,7 @@ True False - gtk-about + help-about 2 @@ -51,7 +51,7 @@ True False - gtk-about + help-about 0 diff --git a/testsuite/reftests/separator-size.ui b/testsuite/reftests/separator-size.ui index 2ac388a42d..006c44ec15 100644 --- a/testsuite/reftests/separator-size.ui +++ b/testsuite/reftests/separator-size.ui @@ -19,7 +19,7 @@ False True True - gtk-about + help-about False @@ -56,7 +56,7 @@ False True True - gtk-about + help-about False @@ -106,7 +106,7 @@ False True True - gtk-about + help-about False @@ -164,7 +164,7 @@ False True True - gtk-about + help-about False -- 2.30.2